Seems Like a better Way to Do This